(bug 19112) Preferences now respects $wgUseExternalEditor, $wgExternalDiffEngine...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0882bed..232b091 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -181,6 +181,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 18925) history.js removes class names of list elements on initialization
 * Multiple whitespace in TOC anchors is now stripped, for consistency with the
   link from the edit comment
+* (bug 19112) Preferences now respects $wgUseExternalEditor, $wgExternalDiffEngine
 
 == API changes in 1.16 ==
 

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 953f71d..d0135ce 100644 (file)
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -639,18 +639,27 @@ class Preferences {
                                        'section' => 'editing/advancedediting',
                                        'label-message' => 'tog-minordefault',
                                );
-               $defaultPreferences['externaleditor'] =
-                               array(
-                                       'type' => 'toggle',
-                                       'section' => 'editing/advancedediting',
-                                       'label-message' => 'tog-externaleditor',
-                               );
-               $defaultPreferences['externaldiff'] =
-                               array(
-                                       'type' => 'toggle',
-                                       'section' => 'editing/advancedediting',
-                                       'label-message' => 'tog-externaldiff',
-                               );
+
+               global $wgUseExternalEditor;
+               if ($wgUseExternalEditor) {
+                       $defaultPreferences['externaleditor'] =
+                                       array(
+                                               'type' => 'toggle',
+                                               'section' => 'editing/advancedediting',
+                                               'label-message' => 'tog-externaleditor',
+                                       );
+               }
+
+               global $wgExternalDiffEngine;
+               if ($wgExternalDiffEngine) {
+                 $defaultPreferences['externaldiff'] =
+                                       array(
+                                               'type' => 'toggle',
+                                               'section' => 'editing/advancedediting',
+                                               'label-message' => 'tog-externaldiff',
+                                       );
+               }
+
                $defaultPreferences['forceeditsummary'] =
                                array(
                                        'type' => 'toggle',